From fb11036e30127fb4dea4bffa6d8978d22953c611 Mon Sep 17 00:00:00 2001 From: Tim Deegan Date: Wed, 11 Apr 2012 13:10:33 +0100 Subject: [PATCH] x86: fix memset(ptr, 0, sizeof ptr). Signed-off-by: Tim Deegan Acked-by: Jan Beulich Acked-by: Christoph Egger Acked-by: Keir Fraser Committed-by: Tim Deegan --- xen/arch/x86/cpu/mcheck/amd_f10.c | 4 ++-- xen/arch/x86/mm/p2m.c | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/cpu/mcheck/amd_f10.c b/xen/arch/x86/cpu/mcheck/amd_f10.c index 0cf5e873ac..d73d5ba47b 100644 --- a/xen/arch/x86/cpu/mcheck/amd_f10.c +++ b/xen/arch/x86/cpu/mcheck/amd_f10.c @@ -73,9 +73,9 @@ amd_f10_handler(struct mc_info *mi, uint16_t bank, uint64_t status) return NULL; } - memset(mc_ext, 0, sizeof(mc_ext)); + memset(mc_ext, 0, sizeof(*mc_ext)); mc_ext->common.type = MC_TYPE_EXTENDED; - mc_ext->common.size = sizeof(mc_ext); + mc_ext->common.size = sizeof(*mc_ext); mc_ext->mc_msrs = 3; mc_ext->mc_msr[0].reg = MSR_F10_MC4_MISC1; diff --git a/xen/arch/x86/mm/p2m.c b/xen/arch/x86/mm/p2m.c index 599ea9310e..68286f7c86 100644 --- a/xen/arch/x86/mm/p2m.c +++ b/xen/arch/x86/mm/p2m.c @@ -1232,11 +1232,10 @@ bool_t p2m_mem_access_check(unsigned long gpa, bool_t gla_valid, unsigned long g } *req_ptr = NULL; - req = xmalloc(mem_event_request_t); + req = xzalloc(mem_event_request_t); if ( req ) { *req_ptr = req; - memset(req, 0, sizeof(req)); req->reason = MEM_EVENT_REASON_VIOLATION; /* Pause the current VCPU */ -- 2.30.2